From 87fdd5931744b65b3db2f191bcd9984928d87132 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Mon, 2 Aug 2004 10:30:38 +0000 Subject: [PATCH] bitkeeper revision 1.1108.33.24 (410e17ceXCIuaFvQA3AD25FUTF_Ohw) For clarity, all interface header files are in Xen's hypervisor-ifs directory. This includes the I/O headers and the xend header. --- .rootkeys | 8 +- .../arch/xen/drivers/blkif/backend/common.h | 2 +- .../arch/xen/drivers/blkif/frontend/common.h | 6 +- .../include/asm-xen/hypervisor.h | 2 +- .../drivers/xen/blkback/common.h | 6 +- .../drivers/xen/blkfront/block.h | 7 +- .../drivers/xen/netback/common.h | 6 +- .../drivers/xen/netfront/netfront.c | 11 +- .../include/asm-xen/asm-i386/hypervisor.h | 2 +- .../include/asm-xen/blkif.h | 115 ------------------ .../include/asm-xen/netif.h | 88 -------------- tools/Make.defs | 1 - tools/libxc/Makefile | 3 - tools/libxc/xc_private.h | 3 +- tools/misc/Makefile | 1 - tools/python/xen/lowlevel/xu/xu.c | 2 +- tools/xentrace/Makefile | 1 - tools/xfrd/Makefile | 3 - .../include/hypervisor-ifs/io}/blkif.h | 0 .../hypervisor-ifs/io}/domain_controller.h | 0 .../include/hypervisor-ifs/io}/netif.h | 0 21 files changed, 17 insertions(+), 250 deletions(-) delete mode 100644 linux-2.6.7-xen-sparse/include/asm-xen/blkif.h delete mode 100644 linux-2.6.7-xen-sparse/include/asm-xen/netif.h rename {linux-2.4.26-xen-sparse/arch/xen/drivers/blkif => xen/include/hypervisor-ifs/io}/blkif.h (100%) rename {tools/python/xen/lowlevel/xu => xen/include/hypervisor-ifs/io}/domain_controller.h (100%) rename {linux-2.4.26-xen-sparse/arch/xen/drivers/netif => xen/include/hypervisor-ifs/io}/netif.h (100%) diff --git a/.rootkeys b/.rootkeys index ac0845c34f..3ec45825fb 100644 --- a/.rootkeys +++ b/.rootkeys @@ -56,7 +56,6 @@ 4087cf0dvXL1PKX23t_LvO1wVPb7OA linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c 4087cf0dkVF3I19gpT1cNubeJgQr7g linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/main.c 4087cf0dlv1Dw4MAbeRStPPG8IvPPg linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/vbd.c -40880cc6hHg6s2cPHbqPNQxENefjoQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/blkif.h 4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile 4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h 4075806d3fJqqDC1pYYPTZPc575iKg linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c @@ -68,7 +67,6 @@ 4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/Makefile 4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/Makefile 405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/Makefile -4097ba83Qy2eafeFUhGhm6_4iMIIDw linux-2.4.26-xen-sparse/arch/xen/drivers/netif/netif.h 3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile 4075806dE5mQwlVUf8-t3YXjiMMWDQ linux-2.4.26-xen-sparse/arch/xen/kernel/ctrl_if.c 3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.26-xen-sparse/arch/xen/kernel/entry.S @@ -249,11 +247,9 @@ 40f5623bc8LKPRO09wY5dGDnY_YCpw linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/tlbflush.h 41062ab7uFxnCq-KtPeAm-aV8CicgA linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/vga.h 40f5623bxUbeGjkRrjDguCy_Gm8RLw linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/xor.h -40f5623bqoi4GEoBiiUc6TZk1HjsMg linux-2.6.7-xen-sparse/include/asm-xen/blkif.h 40f5623bYNP7tHE2zX6YQxp9Zq2utQ linux-2.6.7-xen-sparse/include/asm-xen/ctrl_if.h 40f5623b3Eqs8pAc5WpPX8_jTzV2qw linux-2.6.7-xen-sparse/include/asm-xen/evtchn.h 40f5623cndVUFlkxpf7Lfx7xu8madQ linux-2.6.7-xen-sparse/include/asm-xen/multicall.h -40f5623cTZ80EwjWUBlh44A9F9i_Lg linux-2.6.7-xen-sparse/include/asm-xen/netif.h 3f108af1ylCIm82H052FVTfXACBHrw linux-2.6.7-xen-sparse/include/asm-xen/proc_cmd.h 40f5623cBiQhPHILVLrl3xa6bDBaRg linux-2.6.7-xen-sparse/include/asm-xen/xen.h 3f689063BoW-HWV3auUJ-OqXfcGArw linux-2.6.7-xen-sparse/include/asm-xen/xen_proc.h @@ -382,7 +378,6 @@ 40dfd40aMOhnw_cQLve9462UR5yYxQ tools/python/xen/lowlevel/__init__.py 3fbd0a42l40lM0IICw2jXbQBVZSdZg tools/python/xen/lowlevel/xc/xc.c 40dc4076St6AmPTmQPrtQ6LGHPxGmw tools/python/xen/lowlevel/xu/__init__.py -40dc4076pVeE1kEEWzcUaNZin65kCA tools/python/xen/lowlevel/xu/domain_controller.h 40dc4076CwBYRTUQDdbdU1L6KcLgSw tools/python/xen/lowlevel/xu/xu.c 41052eb84_irpx0E9N_kqBp9eoin5g tools/python/xen/sv/CreateDomain.py 4107986egkTAMIHW7n-i4ShvCGWpLQ tools/python/xen/sv/Daemon.py @@ -699,6 +694,9 @@ 3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h 403cd194j2pyLqXD8FJ-ukvZzkPenw xen/include/hypervisor-ifs/event_channel.h 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h +40f5623bqoi4GEoBiiUc6TZk1HjsMg xen/include/hypervisor-ifs/io/blkif.h +40dc4076pVeE1kEEWzcUaNZin65kCA xen/include/hypervisor-ifs/io/domain_controller.h +40f5623cTZ80EwjWUBlh44A9F9i_Lg xen/include/hypervisor-ifs/io/netif.h 4051db79512nOCGweabrFWO2M2h5ng xen/include/hypervisor-ifs/physdev.h 40589968wmhPmV5-ENbBYmMjnedgKw xen/include/hypervisor-ifs/sched_ctl.h 404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/hypervisor-ifs/trace.h diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h index c1842033ab..668b0e75b4 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h @@ -13,7 +13,7 @@ #include #include #include -#include "../blkif.h" +#include #if 0 #define ASSERT(_p) \ diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h index eb63d1cd8c..03937e0e4c 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h @@ -9,24 +9,20 @@ #include #include - #include #include #include #include #include - #include #include #include #include - #include #include #include #include - -#include "../blkif.h" +#include #if 0 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a ) diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h index fcafd5429c..d1e2d413e0 100644 --- a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/linux-2.6.7-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6.7-xen-sparse/drivers/xen/blkback/common.h index dc4bcf0728..16bfc2197f 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkback/common.h +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkback/common.h @@ -16,11 +16,9 @@ #include #include #include +#include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#include -#else -#include "../blkif.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define irqreturn_t void #define IRQ_HANDLED #endif diff --git a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/block.h index 77002dddb4..9654bd21eb 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/block.h +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/block.h @@ -9,27 +9,22 @@ #include #include - #include #include #include #include #include - #include #include #include #include - #include - #include +#include #include #include #include -#include - #if 0 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a ) #else diff --git a/linux-2.6.7-xen-sparse/drivers/xen/netback/common.h b/linux-2.6.7-xen-sparse/drivers/xen/netback/common.h index dd9e5dc5c4..61d2361231 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/netback/common.h +++ b/linux-2.6.7-xen-sparse/drivers/xen/netback/common.h @@ -15,13 +15,11 @@ #include #include #include +#include #include #include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#include -#else -#include "../netif.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define irqreturn_t void #define IRQ_HANDLED #endif diff --git a/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c index 9381595a2d..71b7bd7ad8 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c @@ -17,20 +17,15 @@ #include #include #include - -#include #include #include - +#include #include #include - +#include #include -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#include -#else -#include "../netif.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define irqreturn_t void #define IRQ_HANDLED #endif diff --git a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/hypervisor.h b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/hypervisor.h index 49bf0975ec..4793b0a787 100644 --- a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/hypervisor.h +++ b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/hypervisor.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/linux-2.6.7-xen-sparse/include/asm-xen/blkif.h b/linux-2.6.7-xen-sparse/include/asm-xen/blkif.h deleted file mode 100644 index 1024629ea7..0000000000 --- a/linux-2.6.7-xen-sparse/include/asm-xen/blkif.h +++ /dev/null @@ -1,115 +0,0 @@ -/****************************************************************************** - * blkif.h - * - * Unified block-device I/O interface for Xen guest OSes. - * - * Copyright (c) 2003-2004, Keir Fraser - */ - -#ifndef __SHARED_BLKIF_H__ -#define __SHARED_BLKIF_H__ - -#define blkif_vdev_t u16 -#define blkif_sector_t u64 - -#define BLKIF_OP_READ 0 -#define BLKIF_OP_WRITE 1 -#define BLKIF_OP_PROBE 2 - -/* NB. Ring size must be small enough for sizeof(blkif_ring_t) <= PAGE_SIZE. */ -#define BLKIF_RING_SIZE 64 - -/* - * Maximum scatter/gather segments per request. - * This is carefully chosen so that sizeof(blkif_ring_t) <= PAGE_SIZE. - * NB. This could be 12 if the ring indexes weren't stored in the same page. - */ -#define BLKIF_MAX_SEGMENTS_PER_REQUEST 11 - -typedef struct { - u8 operation; /* 0: BLKIF_OP_??? */ - u8 nr_segments; /* 1: number of segments */ - blkif_vdev_t device; /* 2: only for read/write requests */ - unsigned long id; /* 4: private guest value, echoed in resp */ - blkif_sector_t sector_number; /* start sector idx on disk (r/w only) */ - /* @f_a_s[2:0]=last_sect ; @f_a_s[5:3]=first_sect ; @f_a_s[:12]=frame. */ - /* @first_sect: first sector in frame to transfer (inclusive). */ - /* @last_sect: last sector in frame to transfer (inclusive). */ - /* @frame: machine page frame number. */ - unsigned long frame_and_sects[BLKIF_MAX_SEGMENTS_PER_REQUEST]; -} PACKED blkif_request_t; - -#define blkif_first_sect(_fas) (((_fas)>>3)&7) -#define blkif_last_sect(_fas) ((_fas)&7) - -typedef struct { - unsigned long id; /* copied from request */ - u8 operation; /* copied from request */ - s16 status; /* BLKIF_RSP_??? */ -} PACKED blkif_response_t; - -#define BLKIF_RSP_ERROR -1 /* non-specific 'error' */ -#define BLKIF_RSP_OKAY 0 /* non-specific 'okay' */ - -/* - * We use a special capitalised type name because it is _essential_ that all - * arithmetic on indexes is done on an integer type of the correct size. - */ -typedef u32 BLKIF_RING_IDX; - -/* - * Ring indexes are 'free running'. That is, they are not stored modulo the - * size of the ring buffer. The following macro converts a free-running counter - * into a value that can directly index a ring-buffer array. - */ -#define MASK_BLKIF_IDX(_i) ((_i)&(BLKIF_RING_SIZE-1)) - -typedef struct { - BLKIF_RING_IDX req_prod; /* 0: Request producer. Updated by front-end. */ - BLKIF_RING_IDX resp_prod; /* 4: Response producer. Updated by back-end. */ - union { /* 8 */ - blkif_request_t req; - blkif_response_t resp; - } PACKED ring[BLKIF_RING_SIZE]; -} PACKED blkif_ring_t; - - -/* - * BLKIF_OP_PROBE: - * The request format for a probe request is constrained as follows: - * @operation == BLKIF_OP_PROBE - * @nr_segments == size of probe buffer in pages - * @device == unused (zero) - * @id == any value (echoed in response message) - * @sector_num == unused (zero) - * @frame_and_sects == list of page-sized buffers. - * (i.e., @first_sect == 0, @last_sect == 7). - * - * The response is a list of vdisk_t elements copied into the out-of-band - * probe buffer. On success the response status field contains the number - * of vdisk_t elements. - */ - -/* XXX SMH: Type values below are chosen to match ide_xxx in Linux ide.h. */ -#define VDISK_TYPE_FLOPPY 0x00 -#define VDISK_TYPE_TAPE 0x01 -#define VDISK_TYPE_CDROM 0x05 -#define VDISK_TYPE_OPTICAL 0x07 -#define VDISK_TYPE_DISK 0x20 - -#define VDISK_TYPE_MASK 0x3F -#define VDISK_TYPE(_x) ((_x) & VDISK_TYPE_MASK) - -/* The top two bits of the type field encode various flags. */ -#define VDISK_FLAG_RO 0x40 -#define VDISK_FLAG_VIRT 0x80 -#define VDISK_READONLY(_x) ((_x) & VDISK_FLAG_RO) -#define VDISK_VIRTUAL(_x) ((_x) & VDISK_FLAG_VIRT) - -typedef struct { - blkif_sector_t capacity; /* 0: Size in terms of 512-byte sectors. */ - blkif_vdev_t device; /* 8: Device number (opaque 16 bit value). */ - u16 info; /* 10: Device type and flags (VDISK_*). */ -} PACKED vdisk_t; /* 12 bytes */ - -#endif /* __SHARED_BLKIF_H__ */ diff --git a/linux-2.6.7-xen-sparse/include/asm-xen/netif.h b/linux-2.6.7-xen-sparse/include/asm-xen/netif.h deleted file mode 100644 index 098b292612..0000000000 --- a/linux-2.6.7-xen-sparse/include/asm-xen/netif.h +++ /dev/null @@ -1,88 +0,0 @@ -/****************************************************************************** - * netif.h - * - * Unified network-device I/O interface for Xen guest OSes. - * - * Copyright (c) 2003-2004, Keir Fraser - */ - -#ifndef __SHARED_NETIF_H__ -#define __SHARED_NETIF_H__ - -typedef struct { - memory_t addr; /* 0: Machine address of packet. */ - MEMORY_PADDING; - u16 id; /* 8: Echoed in response message. */ - u16 size; /* 10: Packet size in bytes. */ -} PACKED netif_tx_request_t; /* 12 bytes */ - -typedef struct { - u16 id; /* 0 */ - s8 status; /* 2 */ - u8 __pad; /* 3 */ -} PACKED netif_tx_response_t; /* 4 bytes */ - -typedef struct { - u16 id; /* 0: Echoed in response message. */ -} PACKED netif_rx_request_t; /* 2 bytes */ - -typedef struct { - memory_t addr; /* 0: Machine address of packet. */ - MEMORY_PADDING; - u16 id; /* 8: */ - s16 status; /* 10: -ve: BLKIF_RSP_* ; +ve: Rx'ed pkt size. */ -} PACKED netif_rx_response_t; /* 12 bytes */ - -/* - * We use a special capitalised type name because it is _essential_ that all - * arithmetic on indexes is done on an integer type of the correct size. - */ -typedef u32 NETIF_RING_IDX; - -/* - * Ring indexes are 'free running'. That is, they are not stored modulo the - * size of the ring buffer. The following macros convert a free-running counter - * into a value that can directly index a ring-buffer array. - */ -#define MASK_NETIF_RX_IDX(_i) ((_i)&(NETIF_RX_RING_SIZE-1)) -#define MASK_NETIF_TX_IDX(_i) ((_i)&(NETIF_TX_RING_SIZE-1)) - -#define NETIF_TX_RING_SIZE 256 -#define NETIF_RX_RING_SIZE 256 - -/* This structure must fit in a memory page. */ -typedef struct { - /* - * Frontend places packets into ring at tx_req_prod. - * Frontend receives event when tx_resp_prod passes tx_event. - */ - NETIF_RING_IDX req_prod; /* 0 */ - NETIF_RING_IDX resp_prod; /* 4 */ - NETIF_RING_IDX event; /* 8 */ - union { /* 12 */ - netif_tx_request_t req; - netif_tx_response_t resp; - } PACKED ring[NETIF_TX_RING_SIZE]; -} PACKED netif_tx_interface_t; - -/* This structure must fit in a memory page. */ -typedef struct { - /* - * Frontend places empty buffers into ring at rx_req_prod. - * Frontend receives event when rx_resp_prod passes rx_event. - */ - NETIF_RING_IDX req_prod; /* 0 */ - NETIF_RING_IDX resp_prod; /* 4 */ - NETIF_RING_IDX event; /* 8 */ - union { /* 12 */ - netif_rx_request_t req; - netif_rx_response_t resp; - } PACKED ring[NETIF_RX_RING_SIZE]; -} PACKED netif_rx_interface_t; - -/* Descriptor status values */ -#define NETIF_RSP_DROPPED -2 -#define NETIF_RSP_ERROR -1 -#define NETIF_RSP_OKAY 0 - -#endif diff --git a/tools/Make.defs b/tools/Make.defs index 938b6cccb4..1b4d4fec7f 100644 --- a/tools/Make.defs +++ b/tools/Make.defs @@ -1,7 +1,6 @@ # -*- mode: Makefile; -*- XEN_HYPERVISOR_IFS = $(XEN_ROOT)/xen/include/hypervisor-ifs XEN_LINUX_INCLUDE = $(XEN_ROOT)/linux-xen-sparse/include -XEN_XU = $(XEN_ROOT)/tools/python/xen/lowlevel/xu XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_LIBXUTIL = $(XEN_ROOT)/tools/libxutil diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index e0e7046cd9..770ecb4225 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -14,9 +14,6 @@ INCLUDES += -I $(XEN_HYPERVISOR_IFS) vpath %h $(XEN_LINUX_INCLUDE) INCLUDES += -I $(XEN_LINUX_INCLUDE) -vpath %.h $(XEN_XU) -INCLUDES += -I $(XEN_XU) - vpath %c $(XEN_LIBXUTIL) INCLUDES += -I $(XEN_LIBXUTIL) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index aff7a80463..5a1cc1d122 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -21,11 +21,10 @@ #include #include #include +#include #include -/* from xend/lib */ -#include #define _PAGE_PRESENT 0x001 #define _PAGE_RW 0x002 diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 2f613ea172..e3eaad9b2c 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -8,7 +8,6 @@ CFLAGS = -Wall -O3 INCLUDES += -I $(XEN_HYPERVISOR_IFS) INCLUDES += -I $(XEN_LINUX_INCLUDE) INCLUDES += -I $(XEN_XC) -INCLUDES += -I $(XEN_XU) INCLUDES += -I $(XEN_LIBXC) INCLUDES += -I $(XEN_LIBXUTIL) diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c index 55a5795209..0a118b7f0f 100644 --- a/tools/python/xen/lowlevel/xu/xu.c +++ b/tools/python/xen/lowlevel/xu/xu.c @@ -23,7 +23,7 @@ #include #include -#include "domain_controller.h" +#include #include diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 9590b5cffb..de5350e3c2 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -8,7 +8,6 @@ CFLAGS = -Wall -Werror -O3 CFLAGS += -I $(XEN_HYPERVISOR_IFS) CFLAGS += -I $(XEN_LINUX_INCLUDE) CFLAGS += -I $(XEN_XC) -CFLAGS += -I $(XEN_XU) CFLAGS += -I $(XEN_LIBXC) CFLAGS += -I $(XEN_LIBXUTIL) diff --git a/tools/xfrd/Makefile b/tools/xfrd/Makefile index 3c78965201..5824960ac9 100644 --- a/tools/xfrd/Makefile +++ b/tools/xfrd/Makefile @@ -15,9 +15,6 @@ INCLUDES += -I $(XEN_HYPERVISOR_IFS) vpath %h $(XEN_LINUX_INCLUDE) INCLUDES += -I $(XEN_LINUX_INCLUDE) -vpath %.h $(XEN_XU) -INCLUDES += -I $(XEN_XU) - vpath %.h $(XEN_LIBXC) INCLUDES += -I $(XEN_LIBXC) diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/blkif.h b/xen/include/hypervisor-ifs/io/blkif.h similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/blkif.h rename to xen/include/hypervisor-ifs/io/blkif.h diff --git a/tools/python/xen/lowlevel/xu/domain_controller.h b/xen/include/hypervisor-ifs/io/domain_controller.h similarity index 100% rename from tools/python/xen/lowlevel/xu/domain_controller.h rename to xen/include/hypervisor-ifs/io/domain_controller.h diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/netif.h b/xen/include/hypervisor-ifs/io/netif.h similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/netif/netif.h rename to xen/include/hypervisor-ifs/io/netif.h -- 2.30.2